From: Kenichi Handa <handa@m17n.org>
Date: Wed, 24 Aug 2011 07:31:56 +0000 (+0900)
Subject: merge
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2495^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c570130e74b2229a1bf4cdcaab199c39631b4716;p=emacs.git

merge
---

c570130e74b2229a1bf4cdcaab199c39631b4716